bitkeeper revision 1.1159.258.140 (428d3693Vbl1emrmRxrfYZ08RoQPjA)

Fix Linux 2.4 build on 2.0-testing

Signed-off-by: ian@xensource.com

diff --git a/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile b/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile
index 3eb0701958535dabf7d1311fb7069f9b66f3bf11..b17b430bf31a0ccaebe7d513fb43835453232238 100644 (file)
--- a/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile
+++ b/linux-2.4.29-xen-sparse/arch/xen/kernel/Makefile
@@ -6,12 +6,12 @@ all: kernel.o head.o init_task.o
 
 O_TARGET := kernel.o
 
-export-objs     := i386_ksyms.o gnttab.o skbuff.o ctrl_if.o
+export-objs     := i386_ksyms.o skbuff.o ctrl_if.o
 
 obj-y  := process.o semaphore.o signal.o entry.o traps.o irq.o  \
                ptrace.o ioport.o ldt.o setup.o time.o sys_i386.o \
                i386_ksyms.o i387.o evtchn.o ctrl_if.o pci-dma.o \
-               reboot.o fixup.o gnttab.o skbuff.o
+               reboot.o fixup.o skbuff.o
 
 ifdef CONFIG_PCI
 obj-y  += pci-i386.o pci-pc.o

diff --git a/linux-2.4.29-xen-sparse/include/asm-xen/page.h b/linux-2.4.29-xen-sparse/include/asm-xen/page.h
index 546cb65b2213f76d0fb3481137bb550baade5a49..ca73ccfc31d01be8707a3a1a113405637f769a62 100644 (file)
--- a/linux-2.4.29-xen-sparse/include/asm-xen/page.h
+++ b/linux-2.4.29-xen-sparse/include/asm-xen/page.h
@@ -77,6 +77,7 @@ static inline unsigned long pte_val(pte_t x)
     if ( (ret & 1) ) ret = machine_to_phys(ret);
     return ret;
 }
+#define pte_val_ma(x)   ((x).pte_low)
 #endif
 #define PTE_MASK       PAGE_MASK
 

diff --git a/linux-2.4.29-xen-sparse/mkbuildtree b/linux-2.4.29-xen-sparse/mkbuildtree
index acf4fb2f85f2b6fe085fc1ecbedff361b760ba13..7e8177802c3c1abb3686655031e5a4e54f89d19c 100755 (executable)
--- a/linux-2.4.29-xen-sparse/mkbuildtree
+++ b/linux-2.4.29-xen-sparse/mkbuildtree
@@ -207,7 +207,6 @@ ln -sf ../asm-i386/vm86.h
 ln -sf ../../${LINUX_26}/include/asm-xen/balloon.h
 ln -sf ../../${LINUX_26}/include/asm-xen/ctrl_if.h
 ln -sf ../../${LINUX_26}/include/asm-xen/evtchn.h
-ln -sf ../../${LINUX_26}/include/asm-xen/gnttab.h
 ln -sf ../../${LINUX_26}/include/asm-xen/hypervisor.h
 ln -sf ../../${LINUX_26}/include/asm-xen/multicall.h
 ln -sf ../../${LINUX_26}/include/asm-xen/xen_proc.h
@@ -228,7 +227,6 @@ ln -sf ../../i386/kernel/sys_i386.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/ctrl_if.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/evtchn.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/fixup.c
-ln -sf ../../../${LINUX_26}/arch/xen/kernel/gnttab.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/reboot.c
 ln -sf ../../../${LINUX_26}/arch/xen/kernel/skbuff.c
 ln -sf ../../../${LINUX_26}/arch/xen/i386/kernel/ioport.c

diff --git a/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c
index ccf2fb07da80e8339dfb679010fa64d11914d75c..55d26709445a874ad7875b1b7c2098cea443eedf 100644 (file)
--- a/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/netfront/netfront.c
@@ -45,6 +45,7 @@
 #include <net/arp.h>
 #include <net/route.h>
 #include <asm/io.h>
+#include <asm/uaccess.h>
 #include <asm-xen/evtchn.h>
 #include <asm-xen/ctrl_if.h>
 #include <asm-xen/xen-public/io/netif.h>